From dfc0275a465727e9a35ca7e527570c30eea7cefc Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Sun, 2 Aug 2009 16:56:02 -0700 Subject: [PATCH] Have update-alternatives handle new manpages; s/NAME.1FLAVOR/NAME.FLAVOR.1/. --- debian/changelog | 7 ++++++- debian/emacsVER-bin-common.postinst | 14 ++------------ debian/emacsVER-bin-common.prerm | 1 - debian/rules | 10 +++++----- 4 files changed, 13 insertions(+), 19 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8a8a2d8b22c..96df04b5f8b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,7 +14,12 @@ emacs23 (23.1+1-2) unstable; urgency=low warnings. Thanks to Sven Joachim for the reminder. - -- Rob Browning Sun, 02 Aug 2009 14:53:26 -0700 + * Fix update-alternatives to reflect the fact that all the binaries + have manpages now. Thanks to Sven Joachim for + the suggestion. Rename manpages from NAME.1FLAVOR to + NAME.FLAVOR.1. + + -- Rob Browning Sun, 02 Aug 2009 16:52:20 -0700 emacs23 (23.1+1-1) unstable; urgency=low diff --git a/debian/emacsVER-bin-common.postinst b/debian/emacsVER-bin-common.postinst index 60599491782..08dc2b2b460 100644 --- a/debian/emacsVER-bin-common.postinst +++ b/debian/emacsVER-bin-common.postinst @@ -8,22 +8,12 @@ ALTERNATIVES="@ALTERNATIVES@" BIN_PRIORITY=@BIN_PRIORITY@ # update-alternatives on things that collide with xemacs, other editors -for i in ctags etags emacsclient +for i in ${ALTERNATIVES} do update-alternatives \ --install /usr/bin/$i $i /usr/bin/$i.${FLAVOR} ${BIN_PRIORITY} \ --slave /usr/share/man/man1/$i.1.gz $i.1.gz \ - /usr/share/man/man1/$i.1${FLAVOR}.gz -done - -for i in ${ALTERNATIVES} -do - test $i = ctags && continue - test $i = etags && continue - test $i = emacs && continue - test $i = emacsclient && continue - update-alternatives --install /usr/bin/$i $i /usr/bin/$i.${FLAVOR} \ - ${BIN_PRIORITY} + /usr/share/man/man1/$i.${FLAVOR}.1.gz done #DEBHELPER# diff --git a/debian/emacsVER-bin-common.prerm b/debian/emacsVER-bin-common.prerm index 7ae55b51996..3ab6c2178ea 100644 --- a/debian/emacsVER-bin-common.prerm +++ b/debian/emacsVER-bin-common.prerm @@ -13,7 +13,6 @@ if [ "$1" != "upgrade" ] then for i in ${ALTERNATIVES} do - test $i = emacs && continue update-alternatives --remove $i /usr/bin/$i.${FLAVOR} done fi diff --git a/debian/rules b/debian/rules index a8373767a21..81fe5e2958a 100755 --- a/debian/rules +++ b/debian/rules @@ -651,10 +651,10 @@ define install_common_binpkg_bits install -d $(2)/usr/share/man/man1 dh_link -p$(3) \ - usr/share/man/man1/emacs.1$(flavor).gz \ + usr/share/man/man1/emacs.$(flavor).1.gz \ usr/share/man/man1/$(flavor).1.gz dh_link -p$(3) \ - usr/share/man/man1/emacs.1$(flavor).gz \ + usr/share/man/man1/emacs.$(flavor).1.gz \ usr/share/man/man1/$(flavor)-$(4).1.gz endef @@ -729,11 +729,11 @@ install: debian/stamp/build $(autogen_install_files) $(pkgdir_common)/usr/share/info/$(info_subdir)/$$f; \ done - perl -pi -e "s|man1/etags\\.1|man1/etags\\.1$(flavor)|" \ - $(pkgdir_common)/usr/share/man/man1/ctags.1$(flavor) + perl -pi -e "s|man1/etags\\.1|man1/etags\\.$(flavor)\\.1|" \ + $(pkgdir_common)/usr/share/man/man1/ctags.$(flavor).1 cd $(pkgdir_common)/usr/share/man/man1/ && \ - for f in *.1; do mv $$f $${f}$(flavor); done + for f in *.1; do mv $$f $$(basename $${f} .1).$(flavor).1; done # At least etc/COPYING is needed by M-x describe-copying. rm $(pkgdir_common)/usr/share/emacs/$(runtime_ver)/etc/COPYING -- 2.30.2